merge emacs-23
authorKenichi Handa <handa@etlken>
Tue, 27 Jul 2010 07:01:48 +0000 (16:01 +0900)
committerKenichi Handa <handa@etlken>
Tue, 27 Jul 2010 07:01:48 +0000 (16:01 +0900)

Trivial merge